git merging branches

welcome to shbcf.ru